Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 12 Feb 2012 21:20:56 +0000 (13:20 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 12 Feb 2012 21:20:56 +0000 (13:20 -0800)
commit3e61cb85d7d8f8b20e1ad1ea1df8855afd5ff19d
tree9a33af8232062c49d9e1779219434c584647aab3
parent589d5bcdfc43b6bb24bef0f27f87b0fc01467134
parenteaef0375fd15a82815cc192b043cd9806e886dc5
Merge from trunk.